PPC/s390: modify if/else block to fix debug build

src/parsing/preparser.cc

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <cmath>
 
 #include "src/allocation.h"
 #include "src/base/logging.h"
 #include "src/conversions-inl.h"
 #include "src/conversions.h"
@@ skipping 261 matching lines @@
   //   ...
 
   if (peek() == Token::SEMICOLON) {
     Next();
     return Statement::Default();
   }
   return ParseSubStatement(allow_function, ok);
 }
 
 PreParser::Statement PreParser::ParseScopedStatement(bool legacy, bool* ok) {
-  if (is_strict(language_mode()) || peek() != Token::FUNCTION ||
-      (legacy && allow_harmony_restrictive_declarations())) {
-    return ParseSubStatement(kDisallowLabelledFunctionStatement, ok);
-  } else {

[adamk, 2016/05/02 21:38:55]

Your compiler really can't tell that an unconditional 'else' ending in a
'return' is always hit? Why doesn't this affect Parser::ParseScopedStatement,
which has a similar code layout?

+  if (!(is_strict(language_mode()) || peek() != Token::FUNCTION ||
+      (legacy && allow_harmony_restrictive_declarations()))) {
     Scope* body_scope = NewScope(scope_, BLOCK_SCOPE);
     BlockState block_state(&scope_, body_scope);
     return ParseFunctionDeclaration(CHECK_OK);

[adamk, 2016/05/02 22:01:15]

If it's only about CHECK_OK, then this can safely be changed from "CHECK_OK" to
"ok".

   }
+  return ParseSubStatement(kDisallowLabelledFunctionStatement, ok);
 }
 
 PreParser::Statement PreParser::ParseSubStatement(
     AllowLabelledFunctionStatement allow_function, bool* ok) {
   // Statement ::
   //   Block
   //   VariableStatement
   //   EmptyStatement
   //   ExpressionStatement
   //   IfStatement
@@ skipping 923 matching lines @@
   }
   Expect(Token::RBRACE, CHECK_OK);
   return PreParserExpression::Default();
 }
 
 #undef CHECK_OK
 
 
 }  // namespace internal
 }  // namespace v8