Reenable function source fingerprint checks. Added checks to MethodRecognizer.

runtime/vm/intermediate_language.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/intermediate_language.h"
 
 #include "vm/bit_vector.h"
 #include "vm/dart_entry.h"
 #include "vm/flow_graph_allocator.h"
 #include "vm/flow_graph_builder.h"
@@ skipping 209 matching lines @@
                          const String& name) {
   // If both names are private mangle test_name before comparison.
   if ((name.CharAt(0) == '_') && (test_name[0] == '_')) {
     const String& test_name_symbol = String::Handle(Symbols::New(test_name));
     return String::Handle(lib.PrivateName(test_name_symbol)).Equals(name);
   }
   return name.Equals(test_name);
 }
 
 
+static bool CheckFingerprint(const Function& function, intptr_t fp) {
+  if (function.SourceFingerprint() != fp) {
+    OS::Print("FP mismatch while recogbnizing method %s:"
+      " expecting %"Pd" found %d\n",
+      function.ToFullyQualifiedCString(),
+      fp,
+      function.SourceFingerprint());
+    return false;
+  }
+  return true;
+}

[siva, 2012/11/21 22:02:50]

We could make this a static function in class Function
that way you don't have to repeat it twice and you would
invoke it as function.CheckFingerprint(fp) below.

[srdjan, 2012/11/21 22:10:36]

Done.

+
+
 MethodRecognizer::Kind MethodRecognizer::RecognizeKind(
     const Function& function) {
   // Only core and math library methods can be recognized.
   const Library& core_lib = Library::Handle(Library::CoreLibrary());
   const Library& math_lib = Library::Handle(Library::MathLibrary());
   const Class& function_class = Class::Handle(function.Owner());
   if ((function_class.library() != core_lib.raw()) &&
       (function_class.library() != math_lib.raw())) {
     return kUnknown;
   }
   const Library& lib = Library::Handle(function_class.library());
   const String& function_name = String::Handle(function.name());
   const String& class_name = String::Handle(function_class.Name());
 
-#define RECOGNIZE_FUNCTION(test_class_name, test_function_name, enum_name)     \
+#define RECOGNIZE_FUNCTION(test_class_name, test_function_name, enum_name, fp) \
   if (CompareNames(lib, #test_function_name, function_name) &&                 \
       CompareNames(lib, #test_class_name, class_name)) {                       \
+    ASSERT(CheckFingerprint(function, fp));                                    \
     return k##enum_name;                                                       \
   }
 RECOGNIZED_LIST(RECOGNIZE_FUNCTION)
 #undef RECOGNIZE_FUNCTION
   return kUnknown;
 }
 
 
 const char* MethodRecognizer::KindToCString(Kind kind) {
-#define KIND_TO_STRING(class_name, function_name, enum_name)                   \
+#define KIND_TO_STRING(class_name, function_name, enum_name, fp)               \
   if (kind == k##enum_name) return #enum_name;
 RECOGNIZED_LIST(KIND_TO_STRING)
 #undef KIND_TO_STRING
   return "?";
 }
 
 
 // ==== Support for visiting flow graphs.
 #define DEFINE_ACCEPT(ShortName)                                               \
 void ShortName##Instr::Accept(FlowGraphVisitor* visitor) {                     \
@@ skipping 2386 matching lines @@
       return Array::length_offset();
     default:
       UNREACHABLE();
       return -1;
   }
 }
 
 #undef __
 
 }  // namespace dart