[vm/bytecode] Include function name into source fingerprints

alexmarkov · commit-bot@chromium.org · commit 7b17602c74fa · 2019-08-28T20:32:51.000Z
This change aligns BytecodeFingerprintHelper::CalculateFunctionFingerprint with KernelFingerprintHelper::CalculateFunctionFingerprint. Fixes vm/cc/FunctionSourceFingerprint with bytecode. Change-Id: I72fd25cbd2d04935c30cfe52838ef5aa890e1291 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/114750 Reviewed-by: Ryan Macnak <rmacnak@google.com> Reviewed-by: Régis Crelier <regis@google.com> Commit-Queue: Alexander Markov <alexmarkov@google.com>
diff --git a/runtime/vm/compiler/frontend/bytecode_fingerprints.cc b/runtime/vm/compiler/frontend/bytecode_fingerprints.cc
@@ -173,15 +173,17 @@ static uint32_t FingerprintA_B_C(uint32_t fp,
 uint32_t BytecodeFingerprintHelper::CalculateFunctionFingerprint(
     const Function& function) {
   ASSERT(function.is_declared_in_bytecode());
+  const intptr_t kHashBits = 30;
+  uint32_t fp = 0;
+  fp = CombineHashes(fp, String::Handle(function.UserVisibleName()).Hash());
   if (function.is_abstract()) {
-    return 0;
+    return FinalizeHash(fp, kHashBits);
   }
   if (!function.HasBytecode()) {
     kernel::BytecodeReader::ReadFunctionBytecode(Thread::Current(), function);
   }
   const Bytecode& code = Bytecode::Handle(function.bytecode());
   const ObjectPool& pool = ObjectPool::Handle(code.object_pool());
-  uint32_t fp = 0;
   const KBCInstr* const start =
       reinterpret_cast<const KBCInstr*>(code.instructions());
   for (const KBCInstr* instr = start; (instr - start) < code.Size();
@@ -200,7 +202,7 @@ uint32_t BytecodeFingerprintHelper::CalculateFunctionFingerprint(
     }
   }
 
-  return FinalizeHash(fp, 30);
+  return FinalizeHash(fp, kHashBits);
 }
 
 }  // namespace kernel

Original file line number	Diff line number	Diff line change
`@@ -173,15 +173,17 @@ static uint32_t FingerprintA_B_C(uint32_t fp,`
`173`	`173`	`uint32_t BytecodeFingerprintHelper::CalculateFunctionFingerprint(`
`174`	`174`	`const Function& function) {`
`175`	`175`	`ASSERT(function.is_declared_in_bytecode());`
	`176`	`+ const intptr_t kHashBits = 30;`
	`177`	`+ uint32_t fp = 0;`
	`178`	`+ fp = CombineHashes(fp, String::Handle(function.UserVisibleName()).Hash());`
`176`	`179`	`if (function.is_abstract()) {`
`177`		`- return 0;`
	`180`	`+ return FinalizeHash(fp, kHashBits);`
`178`	`181`	`}`
`179`	`182`	`if (!function.HasBytecode()) {`
`180`	`183`	`kernel::BytecodeReader::ReadFunctionBytecode(Thread::Current(), function);`
`181`	`184`	`}`
`182`	`185`	`const Bytecode& code = Bytecode::Handle(function.bytecode());`
`183`	`186`	`const ObjectPool& pool = ObjectPool::Handle(code.object_pool());`
`184`		`- uint32_t fp = 0;`
`185`	`187`	`const KBCInstr* const start =`
`186`	`188`	`reinterpret_cast<const KBCInstr*>(code.instructions());`
`187`	`189`	`for (const KBCInstr* instr = start; (instr - start) < code.Size();`
`@@ -200,7 +202,7 @@ uint32_t BytecodeFingerprintHelper::CalculateFunctionFingerprint(`
`200`	`202`	`}`
`201`	`203`	`}`
`202`	`204`
`203`		`- return FinalizeHash(fp, 30);`
	`205`	`+ return FinalizeHash(fp, kHashBits);`
`204`	`206`	`}`
`205`	`207`
`206`	`208`	`} // namespace kernel`