Fix issue 1354: Bad function name inference.

src/func-name-inferrer.cc

 // 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
@@ skipping 16 matching lines @@
 
 #include "v8.h"
 
 #include "ast.h"
 #include "func-name-inferrer.h"
 #include "list-inl.h"
 
 namespace v8 {
 namespace internal {
 
+const char* const FuncNameInferrer::kAnonymousFunctionName =
+    "(anonymous function)";
+
+FuncNameInferrer::FuncNameInferrer()
+    : entries_stack_(10),
+      names_stack_(5),
+      funcs_to_infer_(4),
+      dot_(FACTORY->NewStringFromAscii(CStrVector("."))),
+      anonymous_function_(
+          FACTORY->NewStringFromAscii(CStrVector(kAnonymousFunctionName))) {
+}
+
 
 void FuncNameInferrer::PushEnclosingName(Handle<String> name) {
   // Enclosing name is a name of a constructor function. To check
   // that it is really a constructor, we check that it is not empty
   // and starts with a capital letter.
   if (name->length() > 0 && Runtime::IsUpperCaseChar(
       Isolate::Current()->runtime_state(), name->Get(0))) {

[Vitaly Repeshko, 2011/06/22 13:21:30]

While we're here, let's fix the extra TLS loads by passing an isolate to the
inferrer.

[mnaganov (inactive), 2011/06/22 20:21:08]

Done.

-    names_stack_.Add(name);
+    names_stack_.Add(Name(name, kEnclosingConstructorName));
   }
 }
 
 
 void FuncNameInferrer::PushLiteralName(Handle<String> name) {
   if (IsOpen() && !HEAP->prototype_symbol()->Equals(*name)) {
-    names_stack_.Add(name);
+    names_stack_.Add(Name(name, kLiteralName));
   }
 }
 
 
 void FuncNameInferrer::PushVariableName(Handle<String> name) {
   if (IsOpen() && !HEAP->result_symbol()->Equals(*name)) {
-    names_stack_.Add(name);
+    names_stack_.Add(Name(name, kVariableName));
   }
 }
 
 
 Handle<String> FuncNameInferrer::MakeNameFromStack() {
-  if (names_stack_.is_empty()) {
-    return FACTORY->empty_string();
-  } else {
-    return MakeNameFromStackHelper(1, names_stack_.at(0));
-  }
+  return MakeNameFromStackHelper(0, FACTORY->empty_string());
 }
 
 
 Handle<String> FuncNameInferrer::MakeNameFromStackHelper(int pos,
                                                          Handle<String> prev) {
-  if (pos >= names_stack_.length()) {
-    return prev;
+  if (pos >= names_stack_.length()) return prev;
+  if (pos < names_stack_.length() - 1 &&
+      names_stack_.at(pos).type == kVariableName &&
+      names_stack_.at(pos + 1).type == kVariableName) {
+    // Skip consecutive variable declarations.
+    return MakeNameFromStackHelper(pos + 1, prev);
   } else {
-    Handle<String> curr = FACTORY->NewConsString(dot_, names_stack_.at(pos));
-    return MakeNameFromStackHelper(pos + 1, FACTORY->NewConsString(prev, curr));
+    if (prev->length() > 0) {
+      Handle<String> curr =
+          FACTORY->NewConsString(dot_, names_stack_.at(pos).name);
+      return MakeNameFromStackHelper(pos + 1,
+                                     FACTORY->NewConsString(prev, curr));
+    } else {
+      return MakeNameFromStackHelper(pos + 1, names_stack_.at(pos).name);
+    }
   }
 }
 
 
 void FuncNameInferrer::InferFunctionsNames() {
   Handle<String> func_name = MakeNameFromStack();
   for (int i = 0; i < funcs_to_infer_.length(); ++i) {
     funcs_to_infer_[i]->set_inferred_name(func_name);
   }
   funcs_to_infer_.Rewind(0);
 }
 
 
 } }  // namespace v8::internal