diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2020-04-08 15:12:39 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2020-04-09 09:13:47 +0000 |
| commit | 605c5914b9561c67b4e8b142715410a569f9ca45 (patch) | |
| tree | 7b7f1a73d19ae4df007f50784e16f8f2b65f4f58 /compiler/optimizing/instruction_builder.cc | |
| parent | 32b24fdc3466d01f799e0ef39859b103d5c701bc (diff) | |
Add more DCHECKs to investigate build bot failure.
Test: test.py
Change-Id: I625564895dd701fb04f1ceb3b7bb21ffa273e776
Diffstat (limited to 'compiler/optimizing/instruction_builder.cc')
| -rw-r--r-- | compiler/optimizing/instruction_builder.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/compiler/optimizing/instruction_builder.cc b/compiler/optimizing/instruction_builder.cc index 9c6576bc18..332aa262cb 100644 --- a/compiler/optimizing/instruction_builder.cc +++ b/compiler/optimizing/instruction_builder.cc @@ -382,12 +382,15 @@ bool HInstructionBuilder::Build() { AppendInstruction(new (allocator_) HNativeDebugInfo(dex_pc)); } + DCHECK(!Thread::Current()->IsExceptionPending()) + << dex_file_->PrettyMethod(dex_compilation_unit_->GetDexMethodIndex()) + << " " << pair.Inst().Name() << "@" << dex_pc; if (!ProcessDexInstruction(pair.Inst(), dex_pc, quicken_index)) { return false; } DCHECK(!Thread::Current()->IsExceptionPending()) << dex_file_->PrettyMethod(dex_compilation_unit_->GetDexMethodIndex()) - << pair.Inst().Name() << "@" << dex_pc; + << " " << pair.Inst().Name() << "@" << dex_pc; if (QuickenInfoTable::NeedsIndexForInstruction(&pair.Inst())) { ++quicken_index; @@ -835,6 +838,7 @@ ArtMethod* HInstructionBuilder::ResolveMethod(uint16_t method_idx, InvokeType in soa.Self()->ClearException(); return nullptr; } + DCHECK(!soa.Self()->IsExceptionPending()); // The referrer may be unresolved for AOT if we're compiling a class that cannot be // resolved because, for example, we don't find a superclass in the classpath. @@ -922,6 +926,7 @@ bool HInstructionBuilder::BuildInvoke(const Instruction& instruction, ArtMethod* resolved_method = ResolveMethod(method_idx, invoke_type); if (UNLIKELY(resolved_method == nullptr)) { + DCHECK(!Thread::Current()->IsExceptionPending()); MaybeRecordStat(compilation_stats_, MethodCompilationStat::kUnresolvedMethod); HInvoke* invoke = new (allocator_) HInvokeUnresolved(allocator_, |