nashorn/test/script/basic/NASHORN-406.js
author attila
Thu, 31 Jan 2013 18:34:42 +0100
changeset 16206 83069fa0935b
parent 16151 97c1e756ae1e
child 24778 2ff5d7041566
permissions -rw-r--r--
8006529: Methods always get callee - it should be conditional Summary: This commit streamlines the bytecode function signatures, prologue, local variable use, scope creation, and invocation. It started out quite innocently when we noticed that we always emit __callee__ parameters for all functions even when they are not needed, but it turned out to be quite a deep rabbit hole. In the end, I identified exact conditions when functions need to have a callee parameter, when they need to receive parent scope, when they need to create their own scope, when they need to have variable arity signature, and when they need to have an "arguments" object, and made sure that callee parameters in signatures only show up when they are needed, that parent function's scope is only passed to a child function when it is needed, that the function only creates its own scope when it is needed. In crypto.js, the number of scopes dropped from 446 to 244, and the number of callees dropped from 315 to 145. Reviewed-by: jlaskey, lagergren
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
16147
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
     1
/*
16151
97c1e756ae1e 8005663: Update copyright year to 2013
jlaskey
parents: 16147
diff changeset
     2
 * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
16147
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
     4
 * 
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
     7
 * published by the Free Software Foundation.
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
     8
 * 
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    13
 * accompanied this code).
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    14
 * 
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    18
 * 
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    21
 * questions.
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    22
 */
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    23
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    24
/**
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    25
 * NASHORN-406 : Property descriptor properties should be enumerable 
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    26
 *
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    27
 * @test
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    28
 * @run
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    29
 */
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    30
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    31
var obj = {
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    32
    foo : 10,
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    33
    get bar() { return 32; },
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    34
    set bar(x) {},
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    35
};
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    36
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    37
function checkData() {
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    38
   var desc = Object.getOwnPropertyDescriptor(obj, "foo");
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    39
   var enumSeen = false, writeSeen = false, 
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    40
       configSeen = false, valueSeen = false;
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    41
   for (i in desc) {
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    42
       switch(i) {
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    43
           case 'enumerable':
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    44
               enumSeen = true; break;
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    45
           case 'writable':
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    46
               writeSeen = true; break;
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    47
           case 'configurable':
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    48
               configSeen = true; break;
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    49
           case 'value':
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    50
               valueSeen = true; break;
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    51
       }
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    52
   }
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    53
   
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    54
   return enumSeen && writeSeen && configSeen && valueSeen;
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    55
}
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    56
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    57
if (!checkData()) {
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    58
    fail("data descriptor check failed");
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    59
}
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    60
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    61
function checkAccessor() {
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    62
   var desc = Object.getOwnPropertyDescriptor(obj, "bar");
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    63
   var enumSeen = false, getterSeen = false, 
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    64
       configSeen = false, setterSeen = false;
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    65
   for (i in desc) {
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    66
       switch(i) {
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    67
           case 'enumerable':
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    68
               enumSeen = true; break;
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    69
           case 'configurable':
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    70
               configSeen = true; break;
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    71
           case 'get':
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    72
               getterSeen = true; break;
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    73
           case 'set':
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    74
               setterSeen = true; break;
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    75
        }
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    76
   }
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    77
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    78
   return enumSeen && configSeen && getterSeen && setterSeen;
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    79
}
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    80
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    81
if (!checkAccessor()) {
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    82
    fail("accessor descriptor check failed");
e63b63819133 8005403: Open-source Nashorn
jlaskey
parents:
diff changeset
    83
}