Various bits of LLVM changes that are in dalvik-dev but not ics-mr1-plus-art.
LLVM guys: please review this; I don't know why you only had these changes
in dalvik-dev, but I'm assuming it wasn't deliberate.
Change-Id: Icfcba5ea13fe135b441ce6b78a1638cb5e37e30e
diff --git a/src/compiler.cc b/src/compiler.cc
index 2e285ce..af06de1 100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -318,13 +318,14 @@
compiler_(NULL),
compiler_context_(NULL),
jni_compiler_(NULL),
- create_invoke_stub_(NULL)
-#if defined(ART_USE_LLVM_COMPILER)
- , compiler_enable_auto_elf_loading_(NULL),
+#if !defined(ART_USE_LLVM_COMPILER)
+ create_invoke_stub_(NULL) {
+#else
+ create_invoke_stub_(NULL),
+ compiler_enable_auto_elf_loading_(NULL),
compiler_get_method_code_addr_(NULL),
- compiler_get_method_invoke_stub_addr_(NULL)
+ compiler_get_method_invoke_stub_addr_(NULL) {
#endif
-{
std::string compiler_so_name(MakeCompilerSoName(instruction_set_));
compiler_library_ = dlopen(compiler_so_name.c_str(), RTLD_LAZY);
if (compiler_library_ == NULL) {