diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-09-03 12:11:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-09-03 12:11:51 +0000 |
| commit | 04695984d8687f13174ca03a943603831d7d0227 (patch) | |
| tree | 897d895e7ca561347215ec2d1babdabb922509c0 /compiler/optimizing/code_generator.cc | |
| parent | ddfbb5f63c1ceb445bc62f48e9333706f9eebe2f (diff) | |
| parent | d1aa7d0eec33e5f297d1eadedda714d4d0a3ef91 (diff) | |
Merge "ART: Remove unneeded SideEffects for fatal instructions."
Diffstat (limited to 'compiler/optimizing/code_generator.cc')
| -rw-r--r-- | compiler/optimizing/code_generator.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator.cc b/compiler/optimizing/code_generator.cc index a90ff3f885..e84896b113 100644 --- a/compiler/optimizing/code_generator.cc +++ b/compiler/optimizing/code_generator.cc @@ -1489,7 +1489,12 @@ void CodeGenerator::ValidateInvokeRuntime(QuickEntrypointEnum entrypoint, << " instruction->GetSideEffects().ToString()=" << instruction->GetSideEffects().ToString(); } else { - DCHECK(instruction->GetSideEffects().Includes(SideEffects::CanTriggerGC()) || + // 'CanTriggerGC' side effect is used to restrict optimization of instructions which depend + // on GC (e.g. IntermediateAddress) - to ensure they are not alive across GC points. However + // if execution never returns to the compiled code from a GC point this restriction is + // unnecessary - in particular for fatal slow paths which might trigger GC. + DCHECK((slow_path->IsFatal() && !instruction->GetLocations()->WillCall()) || + instruction->GetSideEffects().Includes(SideEffects::CanTriggerGC()) || // When (non-Baker) read barriers are enabled, some instructions // use a slow path to emit a read barrier, which does not trigger // GC. |