Merge V8 5.3.332.45. DO NOT MERGE
Test: Manual
FPIIM-449
Change-Id: Id3254828b068abdea3cb10442e0172a8c9a98e03
(cherry picked from commit 13e2dadd00298019ed862f2b2fc5068bba730bcf)
diff --git a/src/crankshaft/arm64/lithium-gap-resolver-arm64.h b/src/crankshaft/arm64/lithium-gap-resolver-arm64.h
index 4f5eb22..acac4e1 100644
--- a/src/crankshaft/arm64/lithium-gap-resolver-arm64.h
+++ b/src/crankshaft/arm64/lithium-gap-resolver-arm64.h
@@ -66,7 +66,8 @@
// Registers used to solve cycles.
const Register& SavedValueRegister() {
- DCHECK(!masm_.ScratchRegister().IsAllocatable());
+ DCHECK(!RegisterConfiguration::Crankshaft()->IsAllocatableGeneralCode(
+ masm_.ScratchRegister().code()));
return masm_.ScratchRegister();
}
// The scratch register is used to break cycles and to store constant.
@@ -77,7 +78,8 @@
// We use the Crankshaft floating-point scratch register to break a cycle
// involving double values as the MacroAssembler will not need it for the
// operations performed by the gap resolver.
- DCHECK(!crankshaft_fp_scratch.IsAllocatable());
+ DCHECK(!RegisterConfiguration::Crankshaft()->IsAllocatableGeneralCode(
+ crankshaft_fp_scratch.code()));
return crankshaft_fp_scratch;
}