Reset trunk to 3.24.35.4

src/symbol.js

 // Copyright 2013 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 18 matching lines @@
 
 // This file relies on the fact that the following declaration has been made
 // in runtime.js:
 // var $Array = global.Array;
 
 var $Symbol = global.Symbol;
 
 // -------------------------------------------------------------------
 
 function SymbolConstructor(x) {
+  var value =
+    IS_SYMBOL(x) ? x : %CreateSymbol(IS_UNDEFINED(x) ? x : ToString(x));
   if (%_IsConstructCall()) {
-    throw MakeTypeError('not_constructor', ["Symbol"]);
+    %_SetValueOf(this, value);
+  } else {
+    return value;
   }
-  // NOTE: Passing in a Symbol value will throw on ToString().
-  return %CreateSymbol(IS_UNDEFINED(x) ? x : ToString(x));
 }
 
+function SymbolGetName() {
+  var symbol = IS_SYMBOL_WRAPPER(this) ? %_ValueOf(this) : this;
+  if (!IS_SYMBOL(symbol)) {
+    throw MakeTypeError(
+        'incompatible_method_receiver', ["Symbol.prototype.name", this]);
+  }
+  return %SymbolName(symbol);
+}
 
 function SymbolToString() {
-  if (!(IS_SYMBOL(this) || IS_SYMBOL_WRAPPER(this))) {
-    throw MakeTypeError(
-      'incompatible_method_receiver', ["Symbol.prototype.toString", this]);
-  }
-  var description = %SymbolDescription(%_ValueOf(this));
-  return "Symbol(" + (IS_UNDEFINED(description) ? "" : description) + ")";
+  throw MakeTypeError('symbol_to_string');
 }
 
-
 function SymbolValueOf() {
-  if (!(IS_SYMBOL(this) || IS_SYMBOL_WRAPPER(this))) {
+  // NOTE: Both Symbol objects and values can enter here as
+  // 'this'. This is not as dictated by ECMA-262.
+  if (!IS_SYMBOL(this) && !IS_SYMBOL_WRAPPER(this)) {
     throw MakeTypeError(
-      'incompatible_method_receiver', ["Symbol.prototype.valueOf", this]);
+        'incompatible_method_receiver', ["Symbol.prototype.valueOf", this]);
   }
   return %_ValueOf(this);
 }
 
 
 // ES6 19.1.2.8
 function ObjectGetOwnPropertySymbols(obj) {
   if (!IS_SPEC_OBJECT(obj)) {
     throw MakeTypeError("called_on_non_object",
                         ["Object.getOwnPropertySymbols"]);
   }
 
   // TODO(arv): Proxies use a shared trap for String and Symbol keys.
 
   return ObjectGetOwnPropertyKeys(obj, true);
 }
 
 
 //-------------------------------------------------------------------
 
 function SetUpSymbol() {
   %CheckIsBootstrapping();
 
   %SetCode($Symbol, SymbolConstructor);
-  %FunctionSetPrototype($Symbol, new $Object());
+  %FunctionSetPrototype($Symbol, new $Symbol());
+  %SetProperty($Symbol.prototype, "constructor", $Symbol, DONT_ENUM);
 
-  %SetProperty($Symbol.prototype, "constructor", $Symbol, DONT_ENUM);
+  InstallGetter($Symbol.prototype, "name", SymbolGetName);
   InstallFunctions($Symbol.prototype, DONT_ENUM, $Array(
     "toString", SymbolToString,
     "valueOf", SymbolValueOf
   ));
 }
 
 SetUpSymbol();
 
 
 function ExtendObject() {
   %CheckIsBootstrapping();
 
   InstallFunctions($Object, DONT_ENUM, $Array(
     "getOwnPropertySymbols", ObjectGetOwnPropertySymbols
   ));
 }
 
 ExtendObject();