Version 5.3.332.9 (cherry-pick)

src/code-stubs-hydrogen.cc

Index: src/code-stubs-hydrogen.cc
diff --git a/src/code-stubs-hydrogen.cc b/src/code-stubs-hydrogen.cc
index b60954b60d5da78a34530bb549345d20177f1559..650e5389a5a5a464a1ca2a1b39ef10e57de9267b 100644
--- a/src/code-stubs-hydrogen.cc
+++ b/src/code-stubs-hydrogen.cc
@@ -470,7 +470,7 @@ HValue* CodeStubGraphBuilder<FastCloneShallowArrayStub>::BuildCodeStub() {
   // TODO(turbofan): This codestub has regressed to need a frame on ia32 at some
   // point and wasn't caught since it wasn't built in the snapshot. We should
   // probably just replace with a TurboFan stub rather than fixing it.
-#if !V8_TARGET_ARCH_IA32
+#if !(V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_X87)
   // This stub is very performance sensitive, the generated code must be tuned
   // so that it doesn't build and eager frame.
   info()->MarkMustNotHaveEagerFrame();
@@ -2069,7 +2069,7 @@ HValue* CodeStubGraphBuilder<RegExpConstructResultStub>::BuildCodeStub() {
   // TODO(turbofan): This codestub has regressed to need a frame on ia32 at some
   // point and wasn't caught since it wasn't built in the snapshot. We should
   // probably just replace with a TurboFan stub rather than fixing it.
-#if !V8_TARGET_ARCH_IA32
+#if !(V8_TARGET_ARCH_IA32 || V8_TARGET_ARCH_X87)
   info()->MarkMustNotHaveEagerFrame();
 #endif