Version 1.1.0-dev.5.2

dart/runtime/vm/intermediate_language_x64.cc

Index: dart/runtime/vm/intermediate_language_x64.cc
===================================================================
--- dart/runtime/vm/intermediate_language_x64.cc	(revision 31530)
+++ dart/runtime/vm/intermediate_language_x64.cc	(working copy)
@@ -96,11 +96,8 @@
     __ Bind(&done);
   }
 #endif
-
-  __ ReturnPatchable();
-  compiler->AddCurrentDescriptor(PcDescriptors::kReturn,
-                                 Isolate::kNoDeoptId,
-                                 token_pos());
+  __ LeaveDartFrame();
+  __ ret();
 }
 
 
@@ -665,7 +662,7 @@
   Register char_code = locs()->in(0).reg();
   Register result = locs()->out().reg();
   __ LoadImmediate(result,
-          Immediate(reinterpret_cast<uword>(Symbols::PredefinedAddress())), PP);
+      Immediate(reinterpret_cast<uword>(Symbols::PredefinedAddress())), PP);
   __ movq(result, Address(result,
                           char_code,
                           TIMES_HALF_WORD_SIZE,  // Char code is a smi.
@@ -673,6 +670,31 @@
 }
 
 
+LocationSummary* StringToCharCodeInstr::MakeLocationSummary(bool opt) const {
+  const intptr_t kNumInputs = 1;
+  return LocationSummary::Make(kNumInputs,
+                               Location::RequiresRegister(),
+                               LocationSummary::kNoCall);
+}
+
+
+void StringToCharCodeInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
+  ASSERT(cid_ == kOneByteStringCid);
+  Register str = locs()->in(0).reg();
+  Register result = locs()->out().reg();
+  Label is_one, done;
+  __ movq(result, FieldAddress(str, String::length_offset()));
+  __ cmpq(result, Immediate(Smi::RawValue(1)));
+  __ j(EQUAL, &is_one, Assembler::kNearJump);
+  __ movq(result, Immediate(Smi::RawValue(-1)));
+  __ jmp(&done);
+  __ Bind(&is_one);
+  __ movzxb(result, FieldAddress(str, OneByteString::data_offset()));
+  __ SmiTag(result);
+  __ Bind(&done);
+}
+
+
 LocationSummary* StringInterpolateInstr::MakeLocationSummary(bool opt) const {
   const intptr_t kNumInputs = 1;
   const intptr_t kNumTemps = 0;