Mon, 07 Dec 2015 13:15:47 -0800
Merge
aoqi@0 | 1 | /* |
aoqi@0 | 2 | * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. |
aoqi@0 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
attila@962 | 4 | * |
aoqi@0 | 5 | * This code is free software; you can redistribute it and/or modify it |
aoqi@0 | 6 | * under the terms of the GNU General Public License version 2 only, as |
aoqi@0 | 7 | * published by the Free Software Foundation. |
attila@962 | 8 | * |
aoqi@0 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
aoqi@0 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
aoqi@0 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
aoqi@0 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
aoqi@0 | 13 | * accompanied this code). |
attila@962 | 14 | * |
aoqi@0 | 15 | * You should have received a copy of the GNU General Public License version |
aoqi@0 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
aoqi@0 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
attila@962 | 18 | * |
aoqi@0 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
aoqi@0 | 20 | * or visit www.oracle.com if you need additional information or have any |
aoqi@0 | 21 | * questions. |
aoqi@0 | 22 | */ |
aoqi@0 | 23 | |
aoqi@0 | 24 | /** |
aoqi@0 | 25 | * JDK-8029667: Prototype linking is incorrect |
aoqi@0 | 26 | * |
aoqi@0 | 27 | * @test |
aoqi@0 | 28 | * @run |
aoqi@0 | 29 | */ |
aoqi@0 | 30 | |
aoqi@0 | 31 | function f(x) { |
attila@962 | 32 | return (function inner() { |
aoqi@0 | 33 | var y; (function dummy() { return y })() // force own scope for the inner function |
aoqi@0 | 34 | with({}) { // 'with' block turns off fast scopes |
aoqi@0 | 35 | return x |
aoqi@0 | 36 | } |
aoqi@0 | 37 | })(); |
aoqi@0 | 38 | } |
aoqi@0 | 39 | print(f(1)); |
aoqi@0 | 40 | print(f(2)); |
aoqi@0 | 41 | |
attila@962 | 42 | function g(x) { |
attila@962 | 43 | (function inner() { |
aoqi@0 | 44 | var y; (function dummy() { return y })() // force own scope for the inner function |
aoqi@0 | 45 | with({}) { // 'with' block turns off fast scopes |
aoqi@0 | 46 | // Test setter as well as getter |
aoqi@0 | 47 | x = x + 2; |
aoqi@0 | 48 | } |
aoqi@0 | 49 | })(); |
aoqi@0 | 50 | print(x); |
aoqi@0 | 51 | } |
aoqi@0 | 52 | |
aoqi@0 | 53 | g(1); |
aoqi@0 | 54 | g(2); |
aoqi@0 | 55 | |
aoqi@0 | 56 | var withScopes = [{ func: function() { print("called 1");} }, { func: function() { print("called 2");} }]; |
aoqi@0 | 57 | |
aoqi@0 | 58 | for(var i in withScopes) { |
aoqi@0 | 59 | with (withScopes[i]) { |
aoqi@0 | 60 | var main = function() { |
aoqi@0 | 61 | var frame; // <---- this local variable caused scope to be not set properly prior to fix |
aoqi@0 | 62 | |
aoqi@0 | 63 | function callFunc() { |
aoqi@0 | 64 | frame = func(); |
aoqi@0 | 65 | } |
aoqi@0 | 66 | |
aoqi@0 | 67 | callFunc(); |
aoqi@0 | 68 | } |
aoqi@0 | 69 | } |
aoqi@0 | 70 | main(); |
aoqi@0 | 71 | } |
aoqi@0 | 72 | |
aoqi@0 | 73 | for(var i in withScopes) { |
aoqi@0 | 74 | with (withScopes[i]) { |
aoqi@0 | 75 | var main = function() { |
aoqi@0 | 76 | var frame; // <---- this local variable caused scope to be not set properly prior to fix |
aoqi@0 | 77 | |
aoqi@0 | 78 | function callFunc() { |
aoqi@0 | 79 | frame = func = i; |
aoqi@0 | 80 | } |
aoqi@0 | 81 | |
aoqi@0 | 82 | callFunc(); |
aoqi@0 | 83 | } |
aoqi@0 | 84 | } |
aoqi@0 | 85 | main(); |
attila@962 | 86 | } |
aoqi@0 | 87 | |
aoqi@0 | 88 | print(withScopes[0].func); |
aoqi@0 | 89 | print(withScopes[1].func); |