commit ae71a0539451a8350bdd9d46c76ddab7b763f209
author Nicolas Geoffray <ngeoffray@google.com> Tue Jun 09 14:12:28 2015 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Tue Jun 09 15:03:47 2015 +0100
tree a7f7040991d89bc787ed38864ab09f0bcbf84576
parent 7c5e26b3ea5262c0aea3374148750e81340a4bf9

Fix a crash in optimizing compiler with the current method.

Crash was due to overwriting the location of the current method
in the slow path of an intrinsic.

Change-Id: I6ca58ef5b3cea19925e60b9500aef543bc5f71ef

compiler/optimizing/code_generator_x86.cc

diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc
index f6110a5..135a2bd 100644
--- a/compiler/optimizing/code_generator_x86.cc
+++ b/compiler/optimizing/code_generator_x86.cc
@@ -1231,10 +1231,6 @@
 
   IntrinsicLocationsBuilderX86 intrinsic(codegen_);
   if (intrinsic.TryDispatch(invoke)) {
-    LocationSummary* locations = invoke->GetLocations();
-    if (locations->CanCall()) {
-      locations->SetInAt(invoke->GetCurrentMethodInputIndex(), Location::RequiresRegister());
-    }
     return;
   }
 
@@ -3237,7 +3233,7 @@
     if (current_method.IsRegister()) {
       method_reg = current_method.AsRegister<Register>();
     } else {
-      DCHECK(IsBaseline());
+      DCHECK(IsBaseline() || invoke->GetLocations()->Intrinsified());
       DCHECK(!current_method.IsValid());
       method_reg = reg;
       __ movl(reg, Address(ESP, kCurrentMethodStackOffset));