Merge bleeding_edge r17376:17693.

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 44 matching lines @@
 
 
 void FuncNameInferrer::PushLiteralName(Handle<String> name) {
   if (IsOpen() && !isolate()->heap()->prototype_string()->Equals(*name)) {
     names_stack_.Add(Name(name, kLiteralName), zone());
   }
 }
 
 
 void FuncNameInferrer::PushVariableName(Handle<String> name) {
-  if (IsOpen() && !isolate()->heap()->result_string()->Equals(*name)) {
+  if (IsOpen() && !isolate()->heap()->dot_result_string()->Equals(*name)) {
     names_stack_.Add(Name(name, kVariableName), zone());
   }
 }
 
 
 Handle<String> FuncNameInferrer::MakeNameFromStack() {
   return MakeNameFromStackHelper(0, isolate()->factory()->empty_string());
 }
 
 
@@ skipping 22 matching lines @@
 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