summaryrefslogtreecommitdiff
path: root/compiler/driver/compiler_driver-inl.h
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2016-08-02 03:47:35 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-08-02 03:47:35 +0000
commitba65cc4a71273904294245cb37ce70e5bce797e3 (patch)
treed53a7a816ec4c8e5bdbf80729ac945787b27bf2c /compiler/driver/compiler_driver-inl.h
parent1a827a05afbffd5bee241f245f9aa3c40b4dbae4 (diff)
parent542451cc546779f5c67840e105c51205a1b0a8fd (diff)
Merge "ART: Convert pointer size to enum"
Diffstat (limited to 'compiler/driver/compiler_driver-inl.h')
-rw-r--r--compiler/driver/compiler_driver-inl.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/driver/compiler_driver-inl.h b/compiler/driver/compiler_driver-inl.h
index 94f5acc2b6..3a260f5a80 100644
--- a/compiler/driver/compiler_driver-inl.h
+++ b/compiler/driver/compiler_driver-inl.h
@@ -21,6 +21,7 @@
#include "art_field-inl.h"
#include "art_method-inl.h"
+#include "base/enums.h"
#include "class_linker-inl.h"
#include "dex_compilation_unit.h"
#include "mirror/class_loader.h"
@@ -336,7 +337,7 @@ inline int CompilerDriver::IsFastInvoke(
methods_declaring_class->IsFinal());
// For invoke-super, ensure the vtable index will be correct to dispatch in the vtable of
// the super class.
- const size_t pointer_size = InstructionSetPointerSize(GetInstructionSet());
+ const PointerSize pointer_size = InstructionSetPointerSize(GetInstructionSet());
// TODO We should be able to sharpen if we are going into the boot image as well.
bool can_sharpen_super_based_on_type = same_dex_file &&
(*invoke_type == kSuper) &&