diff options
Diffstat (limited to 'chromium/v8/src/func-name-inferrer.cc')
-rw-r--r-- | chromium/v8/src/func-name-inferrer.cc | 55 |
1 files changed, 18 insertions, 37 deletions
diff --git a/chromium/v8/src/func-name-inferrer.cc b/chromium/v8/src/func-name-inferrer.cc index 5409a4e1800..a3c2f08ae7a 100644 --- a/chromium/v8/src/func-name-inferrer.cc +++ b/chromium/v8/src/func-name-inferrer.cc @@ -1,35 +1,12 @@ // Copyright 2011 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. - -#include "v8.h" - -#include "ast.h" -#include "func-name-inferrer.h" -#include "list-inl.h" +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "src/v8.h" + +#include "src/ast.h" +#include "src/func-name-inferrer.h" +#include "src/list-inl.h" namespace v8 { namespace internal { @@ -55,14 +32,16 @@ void FuncNameInferrer::PushEnclosingName(Handle<String> name) { void FuncNameInferrer::PushLiteralName(Handle<String> name) { - if (IsOpen() && !isolate()->heap()->prototype_string()->Equals(*name)) { + if (IsOpen() && + !String::Equals(isolate()->factory()->prototype_string(), name)) { names_stack_.Add(Name(name, kLiteralName), zone()); } } void FuncNameInferrer::PushVariableName(Handle<String> name) { - if (IsOpen() && !isolate()->heap()->dot_result_string()->Equals(*name)) { + if (IsOpen() && + !String::Equals(isolate()->factory()->dot_result_string(), name)) { names_stack_.Add(Name(name, kVariableName), zone()); } } @@ -83,11 +62,13 @@ Handle<String> FuncNameInferrer::MakeNameFromStackHelper(int pos, return MakeNameFromStackHelper(pos + 1, prev); } else { if (prev->length() > 0) { + Handle<String> name = names_stack_.at(pos).name; + if (prev->length() + name->length() + 1 > String::kMaxLength) return prev; Factory* factory = isolate()->factory(); - Handle<String> curr = factory->NewConsString( - factory->dot_string(), names_stack_.at(pos).name); - return MakeNameFromStackHelper(pos + 1, - factory->NewConsString(prev, curr)); + Handle<String> curr = + factory->NewConsString(factory->dot_string(), name).ToHandleChecked(); + curr = factory->NewConsString(prev, curr).ToHandleChecked(); + return MakeNameFromStackHelper(pos + 1, curr); } else { return MakeNameFromStackHelper(pos + 1, names_stack_.at(pos).name); } |