diff options
| author | 2016-08-19 21:53:57 +0000 | |
|---|---|---|
| committer | 2016-08-19 21:53:58 +0000 | |
| commit | 7a687680e2127d351bbdb3b301ec5d27b68c7d14 (patch) | |
| tree | 74f69c91aa18af6cb475f3a15019b27d124e6f81 /compiler/optimizing | |
| parent | 679e38bad57c70a47ededd4dfcde178c7b3969ff (diff) | |
| parent | 5a5d0faab643eb07ba33d91d47484878c1450b44 (diff) | |
Merge "ART: Fixing build breakage (sharpening DCHECK)."
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/sharpening.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/sharpening.cc b/compiler/optimizing/sharpening.cc index 2bea415591..6effc306dc 100644 --- a/compiler/optimizing/sharpening.cc +++ b/compiler/optimizing/sharpening.cc @@ -298,7 +298,7 @@ void HSharpening::ProcessLoadString(HLoadString* load_string) { // TODO: In follow up CL, add PcRelative and Address back in. } else if (runtime->UseJitCompilation()) { // TODO: Make sure we don't set the "compile PIC" flag for JIT as that's bogus. - DCHECK(!codegen_->GetCompilerOptions().GetCompilePic()); + // DCHECK(!codegen_->GetCompilerOptions().GetCompilePic()); mirror::String* string = dex_cache->GetResolvedString(string_index); if (string != nullptr && runtime->GetHeap()->ObjectIsInBootImageSpace(string)) { desired_load_kind = HLoadString::LoadKind::kBootImageAddress; |