diff options
| author | 2015-01-09 14:03:35 -0800 | |
|---|---|---|
| committer | 2015-01-23 14:07:32 -0800 | |
| commit | 2cd334ae2d4287216523882f0d298cf3901b7ab1 (patch) | |
| tree | b72d3d07e5a04151caca96cae345075b6e4452b0 /compiler | |
| parent | 604e2828896fbb8663897d1e75112da7305ead4c (diff) | |
More of the concurrent copying collector.
Bug: 12687968
Change-Id: I62f70274d47df6d6cab714df95c518b750ce3105
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/image_writer.cc | 1 | ||||
| -rw-r--r-- | compiler/jni/quick/jni_compiler.cc | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/compiler/image_writer.cc b/compiler/image_writer.cc index d69447d172..b2342491fa 100644 --- a/compiler/image_writer.cc +++ b/compiler/image_writer.cc @@ -907,7 +907,6 @@ void ImageWriter::CreateHeader(size_t oat_loaded_size, size_t oat_data_offset) { } void ImageWriter::CopyAndFixupObjects() { - ScopedAssertNoThreadSuspension ants(Thread::Current(), "ImageWriter"); gc::Heap* heap = Runtime::Current()->GetHeap(); // TODO: heap validation can't handle this fix up pass heap->DisableObjectValidation(); diff --git a/compiler/jni/quick/jni_compiler.cc b/compiler/jni/quick/jni_compiler.cc index bf996a251f..ba73828931 100644 --- a/compiler/jni/quick/jni_compiler.cc +++ b/compiler/jni/quick/jni_compiler.cc @@ -135,6 +135,7 @@ CompiledMethod* ArtJniCompileMethodInternal(CompilerDriver* driver, FrameOffset handle_scope_offset = main_jni_conv->CurrentParamHandleScopeEntryOffset(); // Check handle scope offset is within frame CHECK_LT(handle_scope_offset.Uint32Value(), frame_size); + // TODO: Insert the read barrier for this load. __ LoadRef(main_jni_conv->InterproceduralScratchRegister(), mr_conv->MethodRegister(), mirror::ArtMethod::DeclaringClassOffset()); __ VerifyObject(main_jni_conv->InterproceduralScratchRegister(), false); |