From 22896c83040ddef31277c10699f7bf514ea8ab96 Mon Sep 17 00:00:00 2001 From: "kmillikin@chromium.org" Date: Wed, 15 Apr 2009 13:14:23 +0000 Subject: [PATCH] Change the function name collector to tolerate expressions that contain multiple anonymous function literals as subexpressions. Choose the rightmost one the one to attach a name to. Review URL: http://codereview.chromium.org/67165 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@1715 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/func-name-inferrer.h | 3 ++- test/mjsunit/regress/regress-312.js | 31 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 test/mjsunit/regress/regress-312.js diff --git a/src/func-name-inferrer.h b/src/func-name-inferrer.h index 4e49285da..9dcf7c59f 100644 --- a/src/func-name-inferrer.h +++ b/src/func-name-inferrer.h @@ -70,7 +70,8 @@ class FuncNameInferrer BASE_EMBEDDED { void SetFuncToInfer(FunctionLiteral* func_to_infer) { if (IsOpen()) { - ASSERT(func_to_infer_ == NULL); + // If we encounter another function literal after already having + // encountered one, the second one replaces the first. func_to_infer_ = func_to_infer; } } diff --git a/test/mjsunit/regress/regress-312.js b/test/mjsunit/regress/regress-312.js new file mode 100644 index 000000000..0fb8c21f5 --- /dev/null +++ b/test/mjsunit/regress/regress-312.js @@ -0,0 +1,31 @@ +// Copyright 2009 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. + +// Should not trigger debug ASSERT. +// See http://code.google.com/p/v8/issues/detail?id=312 + +var o = { f: "x" ? function () {} : function () {} }; -- 2.34.1