- Use conditional code inclusion for the dart_no_snapshot and dart executables using the MACRO DART…

runtime/vm/intrinsifier.cc

Index: runtime/vm/intrinsifier.cc
===================================================================
--- runtime/vm/intrinsifier.cc	(revision 45661)
+++ runtime/vm/intrinsifier.cc	(working copy)
@@ -34,6 +34,7 @@
 }
 
 
+#if defined(DART_NO_SNAPSHOT)
 void Intrinsifier::InitializeState() {
   Isolate* isolate = Isolate::Current();
   Library& lib = Library::Handle(isolate);
@@ -90,6 +91,7 @@
 
 #undef SETUP_FUNCTION
 }
+#endif  // defined(DART_NO_SNAPSHOT).
 
 
 static void EmitCodeFor(FlowGraphCompiler* compiler,
@@ -143,7 +145,6 @@
   switch (function.recognized_kind()) {
 #define EMIT_CASE(class_name, function_name, enum_name, fp)                    \
     case MethodRecognizer::k##enum_name:                                       \
-      CHECK_FINGERPRINT3(function, class_name, function_name, enum_name, fp);  \
       if (!Build_##enum_name(graph)) return false;                             \
       break;
 
@@ -187,26 +188,24 @@
 
 #define EMIT_CASE(class_name, function_name, enum_name, fp)                    \
     case MethodRecognizer::k##enum_name:                                       \
-      CHECK_FINGERPRINT3(function, class_name, function_name, enum_name, fp);  \
-      compiler->assembler()->Comment("Intrinsic");                             \
       enum_name(compiler->assembler());                                        \
       break;
 
-  if (FLAG_throw_on_javascript_int_overflow && (Smi::kBits >= 32)) {
-    // Integer intrinsics are in the core library, but we don't want to
-    // intrinsify when Smi > 32 bits if we are looking for javascript integer
-    // overflow.
+  compiler->assembler()->Comment("Intrinsic");

[Ivan Posva, 2015/05/08 23:52:00]

Not exactly: If we should throw on JS overflows and this is a integer library
intrinsic then we could have generated the comment without any actual
instructions.

[siva, 2015/05/11 18:22:14]

Good point, pulled it back inside the macro.

+  switch (function.recognized_kind()) {
+    ALL_INTRINSICS_NO_INTEGER_LIB_LIST(EMIT_CASE);
+    default:
+      break;
+  }
+  // Integer intrinsics are in the core library, but we don't want to
+  // intrinsify when Smi > 32 bits if we are looking for javascript integer
+  // overflow.
+  if (!(FLAG_throw_on_javascript_int_overflow && (Smi::kBits >= 32))) {
     switch (function.recognized_kind()) {
-      ALL_INTRINSICS_NO_INTEGER_LIB_LIST(EMIT_CASE);
+      CORE_INTEGER_LIB_INTRINSIC_LIST(EMIT_CASE)
       default:
         break;
     }
-  } else {
-    switch (function.recognized_kind()) {
-      ALL_INTRINSICS_LIST(EMIT_CASE);
-      default:
-        break;
-    }
   }
 #undef EMIT_INTRINSIC
 }