Fixed __proto__ getter.

mongodb-forks · Feb 29, 2020 · 281a94b · 281a94b
1 parent 2a7d122
commit 281a94b
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 6 deletions.
diff --git a/builtin_json.go b/builtin_json.go
@@ -85,7 +85,7 @@ func (r *Runtime) builtinJSON_decodeObject(d *json.Decoder) (*Object, error) {
 			return nil, err
 		}
 
-		if key == "__proto__" {
+		if key == __proto__ {
 			descr := propertyDescr{
 				Value:        value,
 				Writable:     FLAG_TRUE,

diff --git a/compiler_expr.go b/compiler_expr.go
@@ -1337,7 +1337,7 @@ func (e *compiledObjectLiteral) emitGetter(putOnStack bool) {
 		e.c.compileExpression(prop.Value).emitGetter(true)
 		switch prop.Kind {
 		case "value":
-			if prop.Key == "__proto__" {
+			if prop.Key == __proto__ {
 				e.c.emit(setProto)
 			} else {
 				e.c.emit(setProp1(prop.Key))

diff --git a/object.go b/object.go
@@ -213,7 +213,7 @@ func (o *baseObject) put(n Value, val Value, throw bool) {
 
 func (o *baseObject) getOwnProp(name string) Value {
 	v := o.values[name]
-	if v == nil && name == "__proto" {
+	if v == nil && name == __proto__ {
 		return o.prototype
 	}
 	return v
@@ -233,7 +233,7 @@ func (o *baseObject) putStr(name string, val Value, throw bool) {
 		return
 	}
 
-	if name == "__proto__" {
+	if name == __proto__ {
 		if !o.extensible {
 			o.val.runtime.typeErrorResult(throw, "%s is not extensible", o.val)
 			return

diff --git a/runtime_test.go b/runtime_test.go
@@ -1320,6 +1320,13 @@ func TestAutoBoxing(t *testing.T) {
 	testScript1(SCRIPT, valueTrue, t)
 }
 
+func TestProtoGetter(t *testing.T) {
+	const SCRIPT = `
+	({}).__proto__ === Object.prototype && [].__proto__ === Array.prototype;
+	`
+	testScript1(SCRIPT, valueTrue, t)
+}
+
 /*
 func TestArrayConcatSparse(t *testing.T) {
 function foo(a,b,c)

diff --git a/string.go b/string.go
@@ -7,6 +7,10 @@ import (
 	"unicode/utf8"
 )
 
+const (
+	__proto__ = "__proto__"
+)
+
 var (
 	stringTrue         valueString = asciiString("true")
 	stringFalse        valueString = asciiString("false")
@@ -22,7 +26,7 @@ var (
 	stringPlusInfinity             = asciiString("+Infinity")
 	stringNegInfinity              = asciiString("-Infinity")
 	stringEmpty        valueString = asciiString("")
-	string__proto__    valueString = asciiString("__proto__")
+	string__proto__    valueString = asciiString(__proto__)
 
 	stringError          valueString = asciiString("Error")
 	stringTypeError      valueString = asciiString("TypeError")

diff --git a/vm.go b/vm.go
@@ -1073,7 +1073,7 @@ type _setProto struct{}
 var setProto _setProto
 
 func (_setProto) exec(vm *vm) {
-	vm.r.toObject(vm.stack[vm.sp-2]).self.putStr("__proto__", vm.stack[vm.sp-1], true)
+	vm.r.toObject(vm.stack[vm.sp-2]).self.putStr(__proto__, vm.stack[vm.sp-1], true)
 
 	vm.sp--
 	vm.pc++