Merge "Add memory barrier for final instance fields." into dalvik-dev

1 files changed, 3 insertions, 0 deletions

diff --git a/src/compiler/compiler_ir.h b/src/compiler/compiler_ir.h
index 8f00ac2282..15d1ed9396 100644
--- a/src/compiler/compiler_ir.h
+++ b/src/compiler/compiler_ir.h
@@ -276,6 +276,7 @@ struct CompilationUnit {
       class_linker(NULL),
       dex_file(NULL),
       class_loader(NULL),
+      class_def_idx(0),
       method_idx(0),
       code_item(NULL),
       access_flags(0),
@@ -344,6 +345,7 @@ struct CompilationUnit {
       mstats(NULL),
       checkstats(NULL),
       gen_bitcode(false),
+      llvm_info(NULL),
       context(NULL),
       module(NULL),
       func(NULL),
@@ -367,6 +369,7 @@ struct CompilationUnit {
   ClassLinker* class_linker;           // Linker to resolve fields and methods.
   const DexFile* dex_file;             // DexFile containing the method being compiled.
   jobject class_loader;                // compiling method's class loader.
+  uint32_t class_def_idx;              // compiling method's defining class definition index.
   uint32_t method_idx;                 // compiling method's index into method_ids of DexFile.
   const DexFile::CodeItem* code_item;  // compiling method's DexFile code_item.
   uint32_t access_flags;               // compiling method's access flags.