%GetOptimizationStatus(): Unconditionally return a sentinel when --always-opt is...

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

Cr-Commit-Position: refs/heads/master@{#27822}

diff --git a/src/runtime/runtime-test.cc b/src/runtime/runtime-test.cc
index 9a59d9c..81ba261 100644 (file)
--- a/src/runtime/runtime-test.cc
+++ b/src/runtime/runtime-test.cc
@@ -180,10 +180,9 @@ RUNTIME_FUNCTION(Runtime_GetOptimizationStatus) {
     }
   }
   if (FLAG_always_opt) {
-    // We may have always opt, but that is more best-effort than a real
-    // promise, so we still say "no" if it is not optimized.
-    return function->IsOptimized() ? Smi::FromInt(3)   // 3 == "always".
-                                   : Smi::FromInt(2);  // 2 == "no".
+    // With --always-opt, optimization status expectations might not
+    // match up, so just return a sentinel.
+    return Smi::FromInt(3);  // 3 == "always".
   }
   if (FLAG_deopt_every_n_times) {
     return Smi::FromInt(6);  // 6 == "maybe deopted".

diff --git a/test/mjsunit/array-constructor-feedback.js b/test/mjsunit/array-constructor-feedback.js
index c2c1a18..e14c344 100644 (file)
--- a/test/mjsunit/array-constructor-feedback.js
+++ b/test/mjsunit/array-constructor-feedback.js
@@ -26,7 +26,6 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // Flags: --allow-natives-syntax --expose-gc
-// Flags: --noalways-opt
 
 // Test element kind of objects.
 

diff --git a/test/mjsunit/array-feedback.js b/test/mjsunit/array-feedback.js
index ffbb49b..8121f86 100644 (file)
--- a/test/mjsunit/array-feedback.js
+++ b/test/mjsunit/array-feedback.js
@@ -26,7 +26,6 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // Flags: --allow-natives-syntax --expose-gc
-// Flags: --noalways-opt
 
 var elements_kind = {
   fast_smi_only            :  'fast smi only elements',

diff --git a/test/mjsunit/compiler/inlined-call-mapcheck.js b/test/mjsunit/compiler/inlined-call-mapcheck.js
index 84ec1d2..1f7b2da 100644 (file)
--- a/test/mjsunit/compiler/inlined-call-mapcheck.js
+++ b/test/mjsunit/compiler/inlined-call-mapcheck.js
@@ -25,7 +25,7 @@
 // (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 --noalways-opt
+// Flags: --allow-natives-syntax
 
 (function() {
     function f(x) {

diff --git a/test/mjsunit/compiler/inlined-call.js b/test/mjsunit/compiler/inlined-call.js
index dfa1675..f296b08 100644 (file)
--- a/test/mjsunit/compiler/inlined-call.js
+++ b/test/mjsunit/compiler/inlined-call.js
@@ -25,7 +25,7 @@
 // (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 --noalways-opt
+// Flags: --allow-natives-syntax
 
 var global = this;
 

diff --git a/test/mjsunit/compiler/regress-gvn.js b/test/mjsunit/compiler/regress-gvn.js
index 01b1aa9..7055e34 100644 (file)
--- a/test/mjsunit/compiler/regress-gvn.js
+++ b/test/mjsunit/compiler/regress-gvn.js
@@ -25,7 +25,7 @@
 // (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: --noalways-opt --allow-natives-syntax
+// Flags: --allow-natives-syntax
 //
 // Regression test for global value numbering.
 

diff --git a/test/mjsunit/double-intrinsics.js b/test/mjsunit/double-intrinsics.js
index 8084209..16d6538 100644 (file)
--- a/test/mjsunit/double-intrinsics.js
+++ b/test/mjsunit/double-intrinsics.js
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 // Flags: --allow-natives-syntax
-// Flags: --noalways-opt
 
 function assertDoubleBits(hi, lo, x) {
   hi = hi | 0;

diff --git a/test/mjsunit/es6/block-let-crankshaft.js b/test/mjsunit/es6/block-let-crankshaft.js
index 17345a6..9cfdf84 100644 (file)
--- a/test/mjsunit/es6/block-let-crankshaft.js
+++ b/test/mjsunit/es6/block-let-crankshaft.js
@@ -26,7 +26,6 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // Flags: --allow-natives-syntax
-// Flags: --noalways-opt
 
 "use strict";
 

diff --git a/test/mjsunit/regress/regress-320532.js b/test/mjsunit/regress/regress-320532.js
index 0c3198f..7559550 100644 (file)
--- a/test/mjsunit/regress/regress-320532.js
+++ b/test/mjsunit/regress/regress-320532.js
@@ -26,7 +26,6 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 // Flags: --allow-natives-syntax --expose-gc
-// Flags: --noalways-opt
 // Flags: --stress-runs=8 --send-idle-notification --gc-global
 
 

diff --git a/test/mjsunit/regress/regress-385565.js b/test/mjsunit/regress/regress-385565.js
index d2a0875..2a471b2 100644 (file)
--- a/test/mjsunit/regress/regress-385565.js
+++ b/test/mjsunit/regress/regress-385565.js
@@ -25,7 +25,7 @@
 // (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 --noalways-opt
+// Flags: --allow-natives-syntax
 
 var calls = 0;
 

diff --git a/test/mjsunit/regress/regress-crbug-245480.js b/test/mjsunit/regress/regress-crbug-245480.js
index 43fa6ba..55e2df0 100644 (file)
--- a/test/mjsunit/regress/regress-crbug-245480.js
+++ b/test/mjsunit/regress/regress-crbug-245480.js
@@ -26,7 +26,6 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // Flags: --allow-natives-syntax --expose-gc
-// Flags: --noalways-opt
 
 function isHoley(obj) {
   if (%HasFastHoleyElements(obj)) return true;