Merged r17800, r17801 into 3.21 branch.

src/d8.cc

Index: src/d8.cc
diff --git a/src/d8.cc b/src/d8.cc
index fb75d81c24729a592a833254902896f32050f125..da3d14de528f1a036d32a4a2482273a7b2d84634 100644
--- a/src/d8.cc
+++ b/src/d8.cc
@@ -1332,6 +1332,9 @@ bool Shell::SetOptions(int argc, char* argv[]) {
     if (strcmp(argv[i], "--stress-opt") == 0) {
       options.stress_opt = true;
       argv[i] = NULL;
+    } else if (strcmp(argv[i], "--nostress-opt") == 0) {
+      options.stress_opt = false;
+      argv[i] = NULL;
     } else if (strcmp(argv[i], "--stress-deopt") == 0) {
       options.stress_deopt = true;
       argv[i] = NULL;