Fix more fallout from making OptimizeFunctionOnNextCall work as advertised.

R=jarin@chromium.org
BUG=411262

Review URL: https://codereview.chromium.org/544213002

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23745 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/compiler.cc b/src/compiler.cc
index b02033cfdfb465c0d72095422f0493787f21a141..22b35943f25e1d3f148fdce3c830e31cb0b10cbb 100644 (file)
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -1249,6 +1249,7 @@ MaybeHandle<Code> Compiler::GetOptimizedCode(Handle<JSFunction> function,
     if (!GetUnoptimizedCodeCommon(&nested).ToHandle(&current_code)) {
       return MaybeHandle<Code>();
     }
+    shared->ReplaceCode(*current_code);
   }
   int compiled_size = shared->end_position() - shared->start_position();
   isolate->counters()->total_compile_size()->Increment(compiled_size);

diff --git a/src/runtime.cc b/src/runtime.cc
index 7ff15ec69ee059c572f9c2b6507c1d012078df91..501f2fd4435d9a3661388e850fbc9067dccfbda4 100644 (file)
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -8477,7 +8477,7 @@ RUNTIME_FUNCTION(Runtime_CompileOptimized) {
   if (Compiler::GetOptimizedCode(function, unoptimized, mode).ToHandle(&code)) {
     function->ReplaceCode(*code);
   } else {
-    function->ReplaceCode(*unoptimized);
+    function->ReplaceCode(function->shared()->code());
   }
 
   DCHECK(function->code()->kind() == Code::FUNCTION ||

diff --git a/test/mjsunit/compiler/regress-411262.js b/test/mjsunit/compiler/regress-411262.js
new file mode 100644 (file)
index 0000000..ffbfe2e
--- /dev/null
+++ b/test/mjsunit/compiler/regress-411262.js
@@ -0,0 +1,37 @@
+// Copyright 2014 the V8 project authors. All rights reserved.
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+//       notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+//       copyright notice, this list of conditions and the following
+//       disclaimer in the documentation and/or other materials provided
+//       with the distribution.
+//     * Neither the name of Google Inc. nor the names of its
+//       contributors may be used to endorse or promote products derived
+//       from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Flags: --allow-natives-syntax
+
+function b() {
+}
+function f() {
+  b.apply(this, arguments);
+}
+
+%OptimizeFunctionOnNextCall(f);
+f();